Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Jun 2011 15:56:08 +0000 (08:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Jun 2011 15:56:08 +0000 (08:56 -0700)

Trivial merge